Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

task: Drop the join waker of a task eagerly when the JoinHandle gets dropped or the task completes #6986

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Conversation

tglane
Copy link
Contributor

@tglane tglane commented Nov 23, 2024

Motivation

Currently, the waker registered with a JoinHandle is not dropped until the task allocation is dropped. This behaviour may cause the memory allocated by a task to not be freed when in the case of two tasks awaiting each others JoinHandle.

See #6505 for more details.

Solution

To prevent this we need to actively drop the waker when the JoinHandle gets dropped (or the task completes in some cases).

Closes #6505.

@github-actions github-actions bot added R-loom-current-thread Run loom current-thread tests on this PR R-loom-multi-thread Run loom multi-thread tests on this PR R-loom-multi-thread-alt Run loom multi-thread alt tests on this PR labels Nov 23, 2024
@tglane tglane force-pushed the release-waker-on-completion branch from f80d191 to 217b26d Compare November 23, 2024 17:47
dropped or the task completes

Currently, the waker registered with a JoinHandle is not dropped until
the task allocation is dropped. This behaviour may cause the memory
allocated by a task to not be freed when in the case of two tasks
awaiting each others JoinHandle.

This commit changes the behaviour by actively dropping the waker when
the JoinHandle gets dropped (or the task completes in some cases).
@tglane tglane force-pushed the release-waker-on-completion branch from 217b26d to 163d841 Compare November 23, 2024 18:41
@Darksonn Darksonn added A-tokio Area: The main tokio crate M-runtime Module: tokio/runtime labels Nov 25, 2024
tokio/src/runtime/task/mod.rs Outdated Show resolved Hide resolved
tokio/src/runtime/task/mod.rs Outdated Show resolved Hide resolved
tokio/src/runtime/task/mod.rs Show resolved Hide resolved
@tglane tglane force-pushed the release-waker-on-completion branch from eca9c26 to c96a70d Compare November 25, 2024 12:02
@tglane tglane force-pushed the release-waker-on-completion branch from c96a70d to d457bbb Compare November 25, 2024 13:12
tokio/src/runtime/task/harness.rs Outdated Show resolved Hide resolved
tokio/src/runtime/task/harness.rs Outdated Show resolved Hide resolved
* `State::transition_do_join_handle_drop` now returns a struct with to
  booleans to indicate what the JoinHandle should drop
* Use `fetch_and` when unsetting JOIN_WAKER after COMPLETE
tokio/src/runtime/task/state.rs Outdated Show resolved Hide resolved
tokio/src/runtime/task/harness.rs Outdated Show resolved Hide resolved
tokio/src/runtime/task/harness.rs Outdated Show resolved Hide resolved
* Added missing ';' after unsafe blocks
* Improved documentation in `State::transition_to_join_handle_dropped`
  on the scenarios in which `JOIN_WAKER` gets unset
@tglane tglane force-pushed the release-waker-on-completion branch from 46f40da to 9f840cf Compare December 21, 2024 10:00
ref cycle test into a non-loom test (leaks will be detected by miri)
@tglane tglane force-pushed the release-waker-on-completion branch from 9f840cf to 4733c9f Compare December 21, 2024 10:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-tokio Area: The main tokio crate M-runtime Module: tokio/runtime R-loom-current-thread Run loom current-thread tests on this PR R-loom-multi-thread Run loom multi-thread tests on this PR R-loom-multi-thread-alt Run loom multi-thread alt tests on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

JoinHandle wakers are kept alive longer than necessary
2 participants